home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
SGI Freeware 2001 May
/
SGI Freeware 2001 May - Disc 3.iso
/
dist
/
fw_apache.idb
/
usr
/
freeware
/
src
/
apache
/
patches.z
/
patches
Wrap
Text File
|
2001-01-10
|
10KB
|
298 lines
--- ./src/ap/Makefile.tmpl Thu Jun 22 16:22:21 2000
+++ ../apache_1.3.14/./src/ap/Makefile.tmpl Mon Nov 6 05:16:28 2000
@@ -23,7 +23,7 @@
$(LIB): $(OBJS)
rm -f $@
- ar cr $@ $(OBJS)
+ $(AR) cr $@ $(OBJS)
$(RANLIB) $@
# We really don't expect end users to use this rule. It works only with
--- ./src/ap/ap_fnmatch.c Mon Jul 13 04:32:39 1998
+++ ../apache_1.3.14/./src/ap/ap_fnmatch.c Mon Nov 6 05:06:28 2000
@@ -44,7 +44,7 @@
*/
#include "ap_config.h"
-#include "fnmatch.h"
+#include "../include/fnmatch.h"
#include <string.h>
#define EOS '\0'
--- ./src/os/unix/Makefile.tmpl Sun Sep 6 23:59:35 1998
+++ ../apache_1.3.14/./src/os/unix/Makefile.tmpl Mon Nov 6 05:16:48 2000
@@ -11,7 +11,7 @@
$(LIB): $(OBJS)
rm -f $@
- ar cr $@ $(OBJS)
+ $(AR) cr $@ $(OBJS)
$(RANLIB) $@
.c.o:
--- ./src/lib/expat-lite/Makefile.tmpl Wed Jun 9 03:45:03 1999
+++ ../apache_1.3.14/./src/lib/expat-lite/Makefile.tmpl Mon Nov 6 05:17:34 2000
@@ -11,7 +11,7 @@
libexpat.a: $(OBJS)
rm -f libexpat.a
- ar cr libexpat.a $(OBJS)
+ $(AR) cr libexpat.a $(OBJS)
$(RANLIB) libexpat.a
clean:
--- ./src/main/Makefile.tmpl Thu Jun 22 16:22:27 2000
+++ ../apache_1.3.14/./src/main/Makefile.tmpl Mon Nov 6 05:20:12 2000
@@ -20,7 +20,7 @@
$(LIB): $(OBJS)
rm -f $@
- ar cr $@ $(OBJS)
+ $(AR) cr $@ $(OBJS)
$(RANLIB) $@
clean:
--- ./src/support/logresolve.pl Fri Jan 1 11:05:34 1999
+++ ../apache_1.3.14/./src/support/logresolve.pl Mon Nov 6 05:02:27 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
# ====================================================================
# Copyright (c) 1995-1999 The Apache Group. All rights reserved.
--- ./src/support/phf_abuse_log.cgi Tue Oct 8 14:14:49 1996
+++ ../apache_1.3.14/./src/support/phf_abuse_log.cgi Mon Nov 6 05:02:45 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
# This script can be used to detect people trying to abuse the security hole which
# existed in A CGI script direstributed with Apache 1.0.3 and earlier versions.
--- ./src/support/dbmmanage Mon Oct 9 21:23:58 2000
+++ ../apache_1.3.14/./src/support/dbmmanage Mon Nov 6 05:01:50 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
# ====================================================================
# The Apache Software License, Version 1.1
--- ./src/support/apxs.pl Mon Feb 28 12:56:07 2000
+++ ../apache_1.3.14/./src/support/apxs.pl Mon Nov 6 06:25:42 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
## ====================================================================
## Copyright (c) 1998-1999 The Apache Group. All rights reserved.
##
@@ -68,18 +68,19 @@
## Configuration
##
-my $CFG_TARGET = q(@TARGET@); # substituted via Makefile.tmpl
-my $CFG_CC = q(@CC@); # substituted via Makefile.tmpl
-my $CFG_CFLAGS = q(@CFLAGS@); # substituted via Makefile.tmpl
-my $CFG_CFLAGS_SHLIB = q(@CFLAGS_SHLIB@); # substituted via Makefile.tmpl
-my $CFG_LD_SHLIB = q(@LD_SHLIB@); # substituted via Makefile.tmpl
-my $CFG_LDFLAGS_SHLIB = q(@LDFLAGS_MOD_SHLIB@); # substituted via Makefile.tmpl
-my $CFG_LIBS_SHLIB = q(@LIBS_SHLIB@); # substituted via Makefile.tmpl
-my $CFG_PREFIX = q(@prefix@); # substituted via APACI install
-my $CFG_SBINDIR = q(@sbindir@); # substituted via APACI install
-my $CFG_INCLUDEDIR = q(@includedir@); # substituted via APACI install
-my $CFG_LIBEXECDIR = q(@libexecdir@); # substituted via APACI install
-my $CFG_SYSCONFDIR = q(@sysconfdir@); # substituted via APACI install
+my $CFG_ROOT = $ENV{ROOT}; # added by SGI Freeware
+my $CFG_TARGET = q(httpd); # substituted via Makefile.tmpl
+my $CFG_CC = q(cc); # substituted via Makefile.tmpl
+my $CFG_CFLAGS = q( -DIRIX -n32 -DMOD_SSL=207101 -DUSE_HSREGEX -DEAPI -DUSE_EXPAT -I../lib/expat-lite `../apaci`);
+my $CFG_CFLAGS_SHLIB = q(-KPIC -DSHARED_MODULE); # substituted via Makefile.tmpl
+my $CFG_LD_SHLIB = q(ld); # substituted via Makefile.tmpl
+my $CFG_LDFLAGS_SHLIB = q(-n32 -shared); # substituted via Makefile.tmpl
+my $CFG_LIBS_SHLIB = q(); # substituted via Makefile.tmpl
+my $CFG_PREFIX = qq(${CFG_ROOT}/usr/freeware/apache); # substituted via APACI install
+my $CFG_SBINDIR = qq(${CFG_ROOT}/usr/freeware/apache/sbin); # substituted via APACI install
+my $CFG_INCLUDEDIR = qq(${CFG_ROOT}/usr/freeware/apache/include); # substituted via APACI install
+my $CFG_LIBEXECDIR = qq(${CFG_ROOT}/usr/freeware/apache/libexec); # substituted via APACI install
+my $CFG_SYSCONFDIR = qq(${CFG_ROOT}/usr/freeware/apache/etc); # substituted via APACI install
##
## Cleanup the above stuff
--- ./src/support/split-logfile Fri Jan 1 11:05:35 1999
+++ ../apache_1.3.14/./src/support/split-logfile Mon Nov 6 05:03:01 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
#
# ====================================================================
# Copyright (c) 1995-1999 The Apache Group. All rights reserved.
--- ./src/support/log_server_status Fri Jun 4 08:54:19 1999
+++ ../apache_1.3.14/./src/support/log_server_status Mon Nov 6 05:02:10 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
# ====================================================================
# Copyright (c) 1995-1999 The Apache Group. All rights reserved.
--- ./src/support/apachectl Tue Apr 6 13:36:33 1999
+++ ../apache_1.3.14/./src/support/apachectl Mon Nov 6 06:36:30 2000
@@ -22,15 +22,15 @@
# -------------------- --------------------
#
# the path to your PID file
-PIDFILE=/usr/local/apache/logs/httpd.pid
+PIDFILE=/usr/freeware/apache/var/run/httpd.pid
#
# the path to your httpd binary, including options if necessary
-HTTPD='/usr/local/apache/src/httpd'
+HTTPD='/usr/freeware/apache/sbin/httpd'
#
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
# programs may work.
-LYNX="lynx -dump"
+LYNX="/usr/freeware/bin/lynx -dump"
#
# the URL to your server's mod_status status page. If you do not
# have one, then status and fullstatus will not work.
--- ./src/regex/Makefile.tmpl Tue Aug 31 21:29:09 1999
+++ ../apache_1.3.14/./src/regex/Makefile.tmpl Mon Nov 6 05:21:27 2000
@@ -39,7 +39,7 @@
libregex.a: $(OBJPRODN)
rm -f libregex.a
- ar cr libregex.a $(OBJPRODN)
+ $(AR) cr libregex.a $(OBJPRODN)
$(RANLIB) libregex.a
default: r
--- ./src/modules/proxy/Makefile.tmpl Thu Jun 22 16:22:35 2000
+++ ../apache_1.3.14/./src/modules/proxy/Makefile.tmpl Mon Nov 6 05:21:45 2000
@@ -14,7 +14,7 @@
libproxy.a: $(OBJS)
rm -f $@
- ar cr $@ $(OBJS)
+ $(AR) cr $@ $(OBJS)
$(RANLIB) $@
libproxy.so: $(OBJS_PIC)
--- ./src/modules/standard/mod_rewrite.h Fri Sep 29 10:32:32 2000
+++ ../apache_1.3.14/./src/modules/standard/mod_rewrite.h Mon Nov 6 03:26:05 2000
@@ -496,6 +496,9 @@
/* Lexicographic Comparison */
static int compare_lexicography(char *cpNum1, char *cpNum2);
+ /* Find end of bracketed expression */
+static char *find_closing_bracket(char *s, int left, int right);
+
#endif /* _MOD_REWRITE_H */
/*EOF*/
--- ./src/modules/standard/mod_rewrite.c Fri Sep 22 13:47:19 2000
+++ ../apache_1.3.14/./src/modules/standard/mod_rewrite.c Mon Nov 6 03:26:05 2000
@@ -2258,30 +2258,51 @@
/* now we have a '$' or a '%' */
if (inp[1] == '{') {
char *endp;
- endp = strchr(inp, '}');
+ endp = find_closing_bracket(inp+2, '{', '}');
if (endp == NULL) {
goto skip;
}
*endp = '\0';
if (inp[0] == '$') {
/* ${...} map lookup expansion */
+ /*
+ * To make rewrite maps useful the lookup key and
+ * default values must be expanded, so we make
+ * recursive calls to do the work. For security
+ * reasons we must never expand a string that includes
+ * verbatim data from the network. The recursion here
+ * isn't a problem because the result of expansion is
+ * only passed to lookup_map() so it cannot be
+ * re-expanded, only re-looked-up. Another way of
+ * looking at it is that the recursion is entirely
+ * driven by the syntax of the nested curly brackets.
+ */
char *key, *dflt, *result;
+ char xkey[MAX_STRING_LEN];
+ char xdflt[MAX_STRING_LEN];
+ char *empty = "";
key = strchr(inp, ':');
if (key == NULL) {
+ *endp = '}';
goto skip;
}
*key++ = '\0';
dflt = strchr(key, '|');
- if (dflt) {
+ if (dflt == NULL) {
+ dflt = empty;
+ }
+ else {
*dflt++ = '\0';
}
- result = lookup_map(r, inp+2, key);
+ do_expand(r, key, xkey, sizeof(xkey), briRR, briRC);
+ do_expand(r, dflt, xdflt, sizeof(xdflt), briRR, briRC);
+ result = lookup_map(r, inp+2, xkey);
if (result == NULL) {
- result = dflt ? dflt : "";
+ result = xdflt;
}
span = ap_cpystrn(outp, result, space) - outp;
key[-1] = ':';
- if (dflt) {
+ if (dflt != empty) {
dflt[-1] = '|';
}
}
@@ -4141,6 +4162,28 @@
}
}
return 0;
+}
+
+/*
+**
+** Find end of bracketed expression
+** s points after the opening bracket
+**
+*/
+
+static char *find_closing_bracket(char *s, int left, int right)
+{
+ int depth;
+
+ for (depth = 1; *s; ++s) {
+ if (*s == right && --depth == 0) {
+ return s;
+ }
+ else if (*s == left) {
+ ++depth;
+ }
+ }
+ return NULL;
}
/*EOF*/
--- ./src/Configure Tue Oct 10 08:30:03 2000
+++ ../apache_1.3.14/./src/Configure Mon Nov 6 05:33:04 2000
@@ -2419,7 +2419,7 @@
dummy $(LIB): $(OBJS)
rm -f $@
- ar cr $@ $(OBJS)
+ $(AR) cr $@ $(OBJS)
$(RANLIB) $@
.SUFFIXES: .o .so .dll
--- ./cgi-bin/printenv Wed Nov 24 10:10:58 1999
+++ ../apache_1.3.14/./cgi-bin/printenv Mon Nov 6 05:04:34 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl5
##
## printenv -- demo CGI program which just prints its environment
##